From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Thu, 30 Jul 2009 17:11:18 +0000 (+0000)
Subject: Follow-up to r54016: deletedcontribs
X-Git-Tag: 1.31.0-rc.0~40637
X-Git-Url: http://git.cyclocoop.org/%22.%24info%5B?a=commitdiff_plain;h=d5b36888a3c5263032136742685dfc875979d521;p=lhc%2Fweb%2Fwiklou.git

Follow-up to r54016: deletedcontribs
---

diff --git a/includes/specials/SpecialDeletedContributions.php b/includes/specials/SpecialDeletedContributions.php
index 4afa30dafc..53466a9e89 100644
--- a/includes/specials/SpecialDeletedContributions.php
+++ b/includes/specials/SpecialDeletedContributions.php
@@ -30,8 +30,11 @@ class DeletedContribsPager extends IndexPager {
 		list( $index, $userCond ) = $this->getUserCond();
 		$conds = array_merge( $userCond, $this->getNamespaceCond() );
 		// Paranoia: avoid brute force searches (bug 17792)
-		if( !$wgUser->isAllowed( 'suppressrevision' ) ) {
-			$conds[] = $this->mDb->bitAnd('ar_deleted', Revision::DELETED_USER) . ' = 0';
+		if( !$wgUser->isAllowed( 'deleterevision' ) ) {
+			$conds[] = $this->mDb->bitAnd('ar_deleted',Revision::DELETED_USER) . ' = 0';
+		} else if( !$wgUser->isAllowed( 'suppressrevision' ) ) {
+			$conds[] = $this->mDb->bitAnd('ar_deleted',Revision::SUPPRESSED_USER) .
+				' != ' . Revision::SUPPRESSED_USER;
 		}
 		return array(
 			'tables' => array( 'archive' ),
@@ -425,4 +428,4 @@ class DeletedContributionsPage extends SpecialPage {
 			Xml::closeElement( 'form' );
 		return $f;
 	}
-}
+}
\ No newline at end of file